Union decisions #1492

Elfangor567 · 2022-08-06T00:32:29Z

No description provided.

- Base that does not yet work.

- Now works, but only if the union nation has cores in VIC2, and that isn't always true.

- Now based on state flags - State Trigger decision added to show where states you need to conquer are - IMPORTANT - Does not seem to initialize currently, and so is completely broken. Further investigation pending.

- It works! - Added some missing shields

- Clang formatting

Ignore CultureGroup leader, is_overseas & unit entries

data/blank_mod/localisation/english/cultures_l_english.yml

data/blank_mod/localisation/english/decisions2_l_english.yml

src/HOI4World/Decisions/Decision.h

src/HOI4World/Decisions/DecisionsInCategory.h

cetvrtak · 2022-08-10T14:49:37Z

src/HOI4World/Decisions/DecisionsInCategory.h

@@ -39,6 +45,8 @@ class DecisionsInCategory: commonItems::parser
  private:
 	std::string name = "";
 	std::vector<decision> theDecisions;
+	std::map<std::string, std::string> localisation;


Localisations should probably include all languages

I don't know how languages are handled in Vic->Hoi, but I can look into it.
I could output each individually perhaps? Not sure if you have a predefined LocBlock like in CK->EU anywhere

Yup, I am lost decisionLocalisations(std::move(decisionLocalisations)), customLocalisations(std::move(customLocalisations)),

I'm not sure anymore either. I know that some other objects (e.g. Dynasty names - House of...) have all the localisations set in the code. I won't be at the computer for couple of days to check how it works with decisions.

src/HOI4World/Decisions/UnionDecisions.cpp

src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.cpp

src/V2World/Provinces/Province.cpp

- Begins to add support for foreign languages for Union Decisions

Idhrendur · 2022-08-27T04:03:02Z

src/HOI4World/States/HoI4States.cpp

+		Log(LogLevel::Debug) << "State: " << newState.getID();
+		for (const auto& popCulture: popCultureMap)
+		{
+			Log(LogLevel::Debug) << "\t\t\t" << popCulture.first << " Pops: " << popCulture.second
+										<< "\n\tPopulation: " << static_cast<double>(totalPopulation);
+			if (popCulture.second / static_cast<double>(totalPopulation) >= 0.25 &&
+				 !newState.getMajorCultures().count(popCulture.first))
+				newState.addMajorCulture(popCulture.first);
+		}


Make this conditional on debug being set to true in configuration. You can pass just the debug variable to this function instead of the whole config when doing so.

Idhrendur · 2022-08-27T04:09:56Z

src/V2World/Provinces/Province.cpp

+		if (!cultures.count(pop.getCulture()))
+			cultures.emplace(pop.getCulture());


Suggested change

if (!cultures.count(pop.getCulture()))

cultures.emplace(pop.getCulture());

cultures.emplace(pop.getCulture());

Idhrendur · 2022-08-27T04:12:44Z

src/HOI4World/States/HoI4States.cpp

+					std::set<std::string> oneCulture = {culture};
+					if (!popCultureMap.count(culture))
+						popCultureMap.emplace(culture,
+							 provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture));
+					else
+						popCultureMap.find(culture)->second +=
+							 provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture);


Suggested change

std::set<std::string> oneCulture = {culture};

if (!popCultureMap.count(culture))

popCultureMap.emplace(culture,

provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture));

else

popCultureMap.find(culture)->second +=

provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture);

if (auto [iterator, success] = popCultureMap.emplace(culture,

provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture)); !success)

{

iterator->second +=

provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture);

}

Fix for my inevitable syntax and formatting errors.

Idhrendur · 2022-08-27T04:16:55Z

Make sure to add yourself to the credits in data/ReadMe.txt

Elfangor567 and others added 8 commits August 1, 2022 20:33

Alpha 0.1

d7432a5

- Base that does not yet work.

Quick fixes

d624267

Alpha 0.2

984e229

- Now works, but only if the union nation has cores in VIC2, and that isn't always true.

Alpha 0.3

baa367b

- Now based on state flags - State Trigger decision added to show where states you need to conquer are - IMPORTANT - Does not seem to initialize currently, and so is completely broken. Further investigation pending.

Ignore CultureGroup leader, is_overseas & unit entries

e5406d4

Beta 1.0

c9cbc34

- It works! - Added some missing shields

Beta 1.1

9a31f52

- Clang formatting

Merge pull request #2 from cetvrtak/Union_Decisions

ce6268a

Ignore CultureGroup leader, is_overseas & unit entries

Elfangor567 requested a review from Idhrendur as a code owner August 6, 2022 00:32

cetvrtak requested changes Aug 10, 2022

View reviewed changes

Language Update Alpha

5bbbdbb

- Begins to add support for foreign languages for Union Decisions

Idhrendur reviewed Aug 27, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Union decisions #1492

Union decisions #1492

Elfangor567 commented Aug 6, 2022

cetvrtak Aug 10, 2022

Elfangor567 Aug 11, 2022

Elfangor567 Aug 11, 2022

cetvrtak Aug 12, 2022

Idhrendur Aug 27, 2022

Idhrendur Aug 27, 2022

Idhrendur Aug 27, 2022

Idhrendur Aug 27, 2022

Idhrendur commented Aug 27, 2022

		if (!cultures.count(pop.getCulture()))
		cultures.emplace(pop.getCulture());

Union decisions #1492

Are you sure you want to change the base?

Union decisions #1492

Conversation

Elfangor567 commented Aug 6, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Idhrendur commented Aug 27, 2022